Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 30 Nov 2011 17:59:17 +0000 (09:59 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 30 Nov 2011 17:59:17 +0000 (09:59 -0800)

Trivial merge